From: Jan D. <jan.h.d@swipnet.se>
Date: Fri, 15 Jan 2010 17:01:04 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8236^2~42
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e12fcd6a19e3eb4971a07267c55eb40abe81827a;p=emacs.git

Merge from trunk
---

e12fcd6a19e3eb4971a07267c55eb40abe81827a